Make sure we always update the virtual root, also when ->priv->root is

2006-02-21  Kristian Rietveld  <kris@imendio.com>

	* gtk/gtktreemodelfilter.c (gtk_tree_model_filter_rows_reordered):
	Make sure we always update the virtual root, also when ->priv->root
	is still NULL.  (Markku Vire)

diff --git a/ChangeLog b/ChangeLog
index 1ebfce3cfd4ac66e8700c2465afd1c120665df88..b317a1271ad126a80897700f20af645b14216b6f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-21  Kristian Rietveld  <kris@imendio.com>
+
+       * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_rows_reordered):
+       Make sure we always update the virtual root, also when ->priv->root
+       is still NULL.  (Markku Vire)
+
 2006-02-21  Anders Carlsson  <andersca@imendio.com>
 
         * gdk/quartz/gdkselection-quartz.c:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1ebfce3cfd4ac66e8700c2465afd1c120665df88..b317a1271ad126a80897700f20af645b14216b6f 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2006-02-21  Kristian Rietveld  <kris@imendio.com>
+
+       * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_rows_reordered):
+       Make sure we always update the virtual root, also when ->priv->root
+       is still NULL.  (Markku Vire)
+
 2006-02-21  Anders Carlsson  <andersca@imendio.com>
 
         * gdk/quartz/gdkselection-quartz.c:

diff --git a/gtk/gtktreemodelfilter.c b/gtk/gtktreemodelfilter.c
index de08f80b31af6c13e8c068eba511fa6e8acbdf95..38beb9f818e9d1695ca95c0b2e2d14e0cd8225c0 100644 (file)
--- a/gtk/gtktreemodelfilter.c
+++ b/gtk/gtktreemodelfilter.c
@@ -1910,9 +1910,6 @@ gtk_tree_model_filter_rows_reordered (GtkTreeModel *c_model,
 
   if (c_path == NULL || gtk_tree_path_get_indices (c_path) == NULL)
     {
-      if (!filter->priv->root)
-        return;
-
       length = gtk_tree_model_iter_n_children (c_model, NULL);
 
       if (filter->priv->virtual_root)
@@ -2009,7 +2006,7 @@ gtk_tree_model_filter_rows_reordered (GtkTreeModel *c_model,
         }
     }
 
-  if (level->array->len < 1)
+  if (!level || level->array->len < 1)
     {
       gtk_tree_path_free (path);
       return;